Revert "theme: use a global headline class"

This reverts commit 5915348396b937516eae66f17ce955081f46e9f0.

diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index d260af137f35c8c6e4712c6e7284b44f2f2bc63c..ab7528ea2cfd7121b86f2bd94b4882202f6942ea 100644 (file)
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -151,8 +151,7 @@ StScrollBar {
 
 /* Modal Dialogs */
 .headline {
-  font-size: 110%;
-  color: #d6d6d1; }
+  font-size: 110%; }
 
 .lightbox {
   background-color: black; }
@@ -324,7 +323,8 @@ StScrollBar {
   spacing: 16px; }
 
 .prompt-dialog-headline {
-  font-weight: bold; }
+  font-weight: bold;
+  color: #bebeb6; }
 
 .prompt-dialog-description:rtl {
   text-align: right; }
@@ -553,7 +553,9 @@ StScrollBar {
   font-weight: bold;
   height: 1.86em; }
   #panel.unlock-screen, #panel.login-screen, #panel.lock-screen {
-    background-color: transparent; }
+    background-color: transparent;
+    background-gradient-start: transparent;
+    background-gradient-end: transparent; }
   #panel #panelLeft, #panel #panelCenter {
     spacing: 4px; }
   #panel .panel-corner {
@@ -563,7 +565,7 @@ StScrollBar {
     -panel-corner-border-color: transparent; }
     #panel .panel-corner:active, #panel .panel-corner:overview, #panel .panel-corner:focus {
       -panel-corner-border-color: #256ab1; }
-    #panel .panel-corner.lock-screen, #panel .panel-corner.login-screen, #panel .panel-cornerunlock-screen {
+    #panel .panel-corner.lock-screen, #panel .panel-corner.login-screen, #panel .panel-corner.unlock-screen {
       -panel-corner-radius: 0;
       -panel-corner-background-color: transparent;
       -panel-corner-border-color: transparent; }

diff --git a/data/theme/gnome-shell-sass b/data/theme/gnome-shell-sass
index 36b87103582b87e30a8b36afe15aa5a9aa1df769..52dbed90aea05fc8a3ce6ec39de4a64fb949518c 160000 (submodule)
--- a/data/theme/gnome-shell-sass
+++ b/data/theme/gnome-shell-sass
@@ -1 +1 @@
-Subproject commit 36b87103582b87e30a8b36afe15aa5a9aa1df769
+Subproject commit 52dbed90aea05fc8a3ce6ec39de4a64fb949518c

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 5ea258f8d43f8a77fd190cbd13383fafd07bf590..28270b872cf758babfc0bff6cc10d107f86287df 100644 (file)
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -151,8 +151,7 @@ StScrollBar {
 
 /* Modal Dialogs */
 .headline {
-  font-size: 110%;
-  color: #d6d6d1; }
+  font-size: 110%; }
 
 .lightbox {
   background-color: black; }
@@ -324,7 +323,8 @@ StScrollBar {
   spacing: 16px; }
 
 .prompt-dialog-headline {
-  font-weight: bold; }
+  font-weight: bold;
+  color: #bebeb6; }
 
 .prompt-dialog-description:rtl {
   text-align: right; }
@@ -553,7 +553,9 @@ StScrollBar {
   font-weight: bold;
   height: 1.86em; }
   #panel.unlock-screen, #panel.login-screen, #panel.lock-screen {
-    background-color: transparent; }
+    background-color: transparent;
+    background-gradient-start: transparent;
+    background-gradient-end: transparent; }
   #panel #panelLeft, #panel #panelCenter {
     spacing: 4px; }
   #panel .panel-corner {
@@ -563,7 +565,7 @@ StScrollBar {
     -panel-corner-border-color: transparent; }
     #panel .panel-corner:active, #panel .panel-corner:overview, #panel .panel-corner:focus {
       -panel-corner-border-color: #256ab1; }
-    #panel .panel-corner.lock-screen, #panel .panel-corner.login-screen, #panel .panel-cornerunlock-screen {
+    #panel .panel-corner.lock-screen, #panel .panel-corner.login-screen, #panel .panel-corner.unlock-screen {
       -panel-corner-radius: 0;
       -panel-corner-background-color: transparent;
       -panel-corner-border-color: transparent; }

diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js
index 602b4968424881d97020a58212c7739d07cd3a85..6102eb15c644f7d9d886de1ba7c308e10c1b30f3 100644 (file)
--- a/js/ui/extensionDownloader.js
+++ b/js/ui/extensionDownloader.js
@@ -211,7 +211,7 @@ const InstallExtensionDialog = new Lang.Class({
         let icon = new St.Icon({ gicon: gicon });
         box.add(icon);
 
-        let label = new St.Label({ style_class: 'prompt-dialog-headline headline',
+        let label = new St.Label({ style_class: 'prompt-dialog-headline',
                                    text: message });
         box.add(label);
     },

diff --git a/js/ui/shellMountOperation.js b/js/ui/shellMountOperation.js
index 413f196b2fddcb464527441314ef432517b2c719..522ae08562c4c25f84a7fd179e24f69a6260cf53 100644 (file)
--- a/js/ui/shellMountOperation.js
+++ b/js/ui/shellMountOperation.js
@@ -347,7 +347,7 @@ const ShellMountPasswordDialog = new Lang.Class({
         mainContentBox.add(this._messageBox,
                            { y_align: St.Align.START, expand: true, x_fill: true, y_fill: true });
 
-        let subject = new St.Label({ style_class: 'prompt-dialog-headline headline' });
+        let subject = new St.Label({ style_class: 'prompt-dialog-headline' });
         this._messageBox.add(subject,
                              { y_fill:  false,
                                y_align: St.Align.START });

diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index dc16677863181da3cd3a87981b998f9aac88fe21..d04455b9f5bb08d3b8e906e7d79eb1d389520405 100644 (file)
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -61,7 +61,7 @@ const DisplayChangeDialog = new Lang.Class({
         mainContentBox.add(messageBox,
                            { expand: true, y_align: St.Align.START });
 
-        let subjectLabel = new St.Label({ style_class: 'prompt-dialog-headline headline',
+        let subjectLabel = new St.Label({ style_class: 'prompt-dialog-headline',
                                             text: _("Do you want to keep these display settings?") });
         messageBox.add(subjectLabel,
                        { y_fill:  false,